Pass bluetooth directory to g-ir-scanner

Rather than relying on the .la file that jhbuild deletes, we
explicitly tell g-ir-scanner to look in this subdirectory.

diff --git a/configure.ac b/configure.ac
index f0ce5e3a6c82b0f2907065c172b22b923ec49bf9..a0fc3382736c60b2897e919fb111bb0a91f9448b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -133,6 +133,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
         BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
         AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
+        AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
         AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
         AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
         AC_SUBST([HAVE_BLUETOOTH],[1])

diff --git a/src/Makefile.am b/src/Makefile.am
index 1cfea99c97f41675e6cb18a522e16a7a4d723073..9cdfc897d9c8804a68956e305225ef19891ea7e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -275,7 +275,7 @@ Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
 Shell_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
-       --add-include-path=$(MUTTER_GIR_DIR)
+       --add-include-path=$(MUTTER_GIR_DIR) -L $(BLUETOOTH_DIR)
 INTROSPECTION_GIRS += Shell-0.1.gir
 CLEANFILES += Shell-0.1.gir